<!doctype html>
<html lang="ru" data-bs-theme="dark">

<head>
    <!-- 2024-05-11 14:14:10 -->
        <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>git am</title>
        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css" integrity="sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github-dark.min.css" integrity="sha512-rO+olRTkcf304DQBxSWxln8JXCzTHlKnIdnMUwYvQa9/Jd4cQaNkItIUj6Z4nvW1dqK0SKXLbn9h4KwZTNtAyw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/7.1.0/css/flag-icons.min.css" integrity="sha512-bZBu2H0+FGFz/stDN/L0k8J0G8qVsAL0ht1qg5kTwtAheiXwiRKyCq1frwfbSFSJN3jooR5kauE0YjtPzhZtJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link href="../../../runebook.css" rel="stylesheet" type="text/css">
    <meta name="x-github" content="https://github.com/runebookdev/runebook">
            <meta name="x-i18n-doc" content="git">
        <script>
        function i18n(element) {
            // NOP
        }
    </script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.5/js.cookie.js" integrity="sha512-F/dia2jKME12jwqiYDayeD+Rr/8jTWUD2wfbuJB0bzSwenSEnXsn4qQ/wVyXUCix5bmCAj8xJdtFr2OqUtjLAw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js" integrity="sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/rxjs/7.8.1/rxjs.umd.min.js" integrity="sha512-D9LDs8YUUVa4V9Gl4Zb+xqRAc7RCzooR3+zzebgK2RMu/KU+dh90pbjEEMzPiSyRSGbSp9j1pZnrO4joGa5WEg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/jquery.mark.min.js" integrity="sha512-mhbv5DqBMgrWL+32MmsDOt/OAvqr/cHimk6B8y/bx/xS88MVkYGPiVv2ixKVrkywF2qHplNRUvFsAHUdxZ3Krg==" crossorigin="anonymous"></script>
    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6424571640879890" crossorigin="anonymous"></script>    <script async src="https://www.googletagmanager.com/gtag/js?id=G-3G5BZ1QEDP"></script>
<script>
    window.dataLayer = window.dataLayer || [];

    function gtag() {
        dataLayer.push(arguments);
    }

    gtag('js', new Date());
    gtag('config', 'G-3G5BZ1QEDP');
</script>    <script>
(function(c, l, a, r, i, t, y) {
    c[a] = c[a] || function() {
        (c[a].q = c[a].q || []).push(arguments)
    };
    t = l.createElement(r);
    t.async = 1;
    t.src = "https://www.clarity.ms/tag/" + i + "?ref=bwt";
    y = l.getElementsByTagName(r)[0];
    y.parentNode.insertBefore(t, y);
})(window, document, "clarity", "script", "jto2hd94r9");
</script>    <script src="../../../theme.js"></script>
</head>

<body>
    <header class="bg-black">
        <div class="container">
            <div class="row">
                <div class="col">
                    <nav class="navbar navbar-expand-lg navbar-dark">
                        <a class="navbar-brand fw-bold" href="https://runebook.dev/ru">
                            <img alt="Runebook.dev" class="d-inline-block align-top mr-1" src="../../../assets/runebook_logo.webp" width="24" height="24">
                            Runebook.dev
                        </a>
                        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                            <span class="navbar-toggler-icon"></span>
                        </button>
                        <div class="collapse navbar-collapse" id="navbarSupportedContent">
                            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/ru#docs">Documentation</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/contributors">Contributors</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://github.com/runebookdev/runebook/issues">GitHub</a>
                                </li>
                            </ul>
                                                                                                <button class="btn btn-success ms-2" id="showPopupButton">
                                        <i class="bi bi-translate"></i>
                                        Show English
                                    </button>
                                                                                        <div class="form-check form-switch ms-3">
                                <label class="text-light">
                                    <input class="form-check-input" type="checkbox" role="switch" id="theme-switch" checked>
                                    <i class="bi bi-moon-stars-fill"></i>
                                </label>
                            </div>
                        </div>
                    </nav>
                </div>
            </div>
        </div>
    </header>

    <!--sse-->
    <div class="container">
    <div class="row">
        <div class="col">
            <nav aria-label="breadcrumb" class="mt-2">
                <ol class="breadcrumb mb-1">
                    <li class="breadcrumb-item">
                        <a href="https://runebook.dev/ru#docs">
                            <span class="fi fi-ru"></span>                            Русский                        </a>
                    </li>
                    <li class="breadcrumb-item">
                        <a href="-index-.html">
                            Git                            2.43                        </a>
                    </li>
                                            <li class="breadcrumb-item">
                            <a href="-index-.html#Email">
                                Email                            </a>
                        </li>
                                    </ol>
            </nav>
        </div>
    </div>
    <br>

    <div class="row">
        <div class="col-md-9">
            <main>
                <article>

                    
                    <h1 class="text-body-emphasis" ><span data-i18n="c25b787fe2d7a380a2fa3ec27a33928e77199429b1b97617a39071b5ced16856/e4" data-source="git-am" onmousemove="i18n(this)">git-am</span></h1> <h2 class="text-body-emphasis"  id="_name"><span data-i18n="dcd1d5223f73b3a965c07e3ff5dbee3eedcfedb806686a05b9b3868a2c3d6d50/3a" data-source="Name" onmousemove="i18n(this)">Name</span></h2> <div> <p><span data-i18n="9838ed519c88c28f1374d66acf03366267ac7fc60390dab1f6122819e7135cb9/a1" data-source="git-am - Apply a series of patches from a mailbox" onmousemove="i18n(this)">git-am &mdash; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy; &scy;&iecy;&rcy;&icy;&yucy; &pcy;&acy;&tcy;&chcy;&iecy;&jcy; &icy;&zcy; &pcy;&ocy;&chcy;&tcy;&ocy;&vcy;&ocy;&gcy;&ocy; &yacy;&shchcy;&icy;&kcy;&acy;</span></p> </div> <h2 class="text-body-emphasis"  id="_synopsis"><span data-i18n="8eb3755381519d7f0479d75446e56e20084834c0460d7ec94926932372ea6c47/0d" data-source="Synopsis" onmousemove="i18n(this)">Synopsis</span></h2> <div> <div> <pre class="hljs language-less" data-highlighted="yes"><span class="hljs-selector-tag">git</span> <span class="hljs-selector-tag">am</span> <span class="hljs-selector-attr">[--signoff]</span> <span class="hljs-selector-attr">[--keep]</span> <span class="hljs-selector-attr">[--[no-]</span><span class="hljs-selector-tag">keep-cr</span>] <span class="hljs-selector-attr">[--[no-]</span><span class="hljs-selector-tag">utf8</span>] <span class="hljs-selector-attr">[--no-verify]</span>
         <span class="hljs-selector-attr">[--[no-]</span><span class="hljs-number">3</span><span class="hljs-selector-tag">way</span>] <span class="hljs-selector-attr">[--interactive]</span> <span class="hljs-selector-attr">[--committer-date-is-author-date]</span>
         <span class="hljs-selector-attr">[--ignore-date]</span> <span class="hljs-selector-attr">[--ignore-space-change | --ignore-whitespace]</span>
         <span class="hljs-selector-attr">[--whitespace=&lt;action&gt;]</span> <span class="hljs-selector-attr">[-C&lt;n&gt;]</span> <span class="hljs-selector-attr">[-p&lt;n&gt;]</span> <span class="hljs-selector-attr">[--directory=&lt;dir&gt;]</span>
         <span class="hljs-selector-attr">[--exclude=&lt;path&gt;]</span> <span class="hljs-selector-attr">[--include=&lt;path&gt;]</span> <span class="hljs-selector-attr">[--reject]</span> <span class="hljs-selector-attr">[-q | --quiet]</span>
         <span class="hljs-selector-attr">[--[no-]</span><span class="hljs-selector-tag">scissors</span>] <span class="hljs-selector-attr">[-S[&lt;keyid&gt;]</span>] <span class="hljs-selector-attr">[--patch-format=&lt;format&gt;]</span>
         <span class="hljs-selector-attr">[--quoted-cr=&lt;action&gt;]</span>
         <span class="hljs-selector-attr">[--empty=(stop|drop|keep)]</span>
         <span class="hljs-selector-attr">[(&lt;mbox&gt; | &lt;Maildir&gt;)&hellip;&ZeroWidthSpace;]</span>
<span class="hljs-selector-tag">git</span> <span class="hljs-selector-tag">am</span> (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)</pre> </div> </div> <h2 class="text-body-emphasis"  id="_description"><span data-i18n="526e0087cc3f254d9f86f6c7d8e23d954c4dfda2b312efc29194ae8a860106ba/d3" data-source="Description" onmousemove="i18n(this)">Description</span></h2> <div> <p><span data-i18n="5770bbccad238f306124f32262406e96c1c99415d4126aa1bbed5264ff1499eb/27" data-source="Splits mail messages in a mailbox into commit log messages, authorship information, and patches, and applies them to the current branch. You could think of it as a reverse operation of &lt;a href=&quot;git-format-patch&quot;&gt;git-format-patch[1]&lt;/a&gt; run on a branch with a straight history without merges." onmousemove="i18n(this)">&Rcy;&acy;&zcy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &pcy;&ocy;&chcy;&tcy;&ocy;&vcy;&ycy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &vcy; &pcy;&ocy;&chcy;&tcy;&ocy;&vcy;&ocy;&mcy; &yacy;&shchcy;&icy;&kcy;&iecy; &ncy;&acy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy; &ocy;&bcy; &acy;&vcy;&tcy;&ocy;&rcy;&scy;&tcy;&vcy;&iecy; &icy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &icy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy; &icy;&khcy; &kcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&iecy;. &Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &dcy;&ucy;&mcy;&acy;&tcy;&softcy; &ocy;&bcy; &ecy;&tcy;&ocy;&mcy; &kcy;&acy;&kcy; &ocy;&bcy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy;&jcy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&icy;  <a href="git-format-patch.html">git-format-patch[1]</a> , &zcy;&acy;&pcy;&ucy;&shchcy;&iecy;&ncy;&ncy;&ocy;&jcy; &ncy;&acy; &vcy;&iecy;&tcy;&kcy;&iecy; &scy; &pcy;&rcy;&yacy;&mcy;&ocy;&jcy; &icy;&scy;&tcy;&ocy;&rcy;&icy;&iecy;&jcy; &bcy;&iecy;&zcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_options"><span data-i18n="d0db8b5e364b6989e4b8f38a2b3846b87d99a51c1592ebf35d21cc66405a8e39/b6" data-source="Options" onmousemove="i18n(this)">Options</span></h2> <div> <div> <dl> <dt id="Documentation/git-am.txt-ltmboxgtltMaildirgt82308203"><span data-i18n="3c47082f60fbb4ed4e87687f79d585b7f967815c38bf1e2bedd6fe799dd17aaf/25" data-source="(&amp;lt;mbox&amp;gt;|&amp;lt;Maildir&amp;gt;)&amp;hellip;" onmousemove="i18n(this)">(&lt;mbox&gt;|&lt;Maildir&gt;)&hellip;</span></dt> <dd> <p><span data-i18n="0f62e83b04d4c1de7106d2ffbecf8fb7b0cfed52bf41027288789a8b4a700631/48" data-source="The list of mailbox files to read patches from. If you do not supply this argument, the command reads from the standard input. If you supply directories, they will be treated as Maildirs." onmousemove="i18n(this)">&Scy;&pcy;&icy;&scy;&ocy;&kcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &pcy;&ocy;&chcy;&tcy;&ocy;&vcy;&ocy;&gcy;&ocy; &yacy;&shchcy;&icy;&kcy;&acy; &dcy;&lcy;&yacy; &chcy;&tcy;&iecy;&ncy;&icy;&yacy; &pcy;&acy;&tcy;&chcy;&iecy;&jcy;. &IEcy;&scy;&lcy;&icy; &vcy;&ycy; &ncy;&iecy; &ucy;&kcy;&acy;&zhcy;&iecy;&tcy;&iecy; &ecy;&tcy;&ocy;&tcy; &acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy;, &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &scy;&chcy;&icy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy; &scy;&ocy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ocy;&gcy;&ocy; &vcy;&vcy;&ocy;&dcy;&acy;. &IEcy;&scy;&lcy;&icy; &vcy;&ycy; &pcy;&rcy;&iecy;&dcy;&ocy;&scy;&tcy;&acy;&vcy;&icy;&tcy;&iecy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&icy;, &ocy;&ncy;&icy; &bcy;&ucy;&dcy;&ucy;&tcy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &kcy;&acy;&kcy; Maildirs.</span></p> </dd> <dt id="Documentation/git-am.txt--s"><span data-i18n="922e17b4edd60ff0277a57db2cdf26a407350a6ffbd4129318f293841d289609/7a" data-source="-s" onmousemove="i18n(this)">-s</span></dt> <dt id="Documentation/git-am.txt---signoff"><span data-i18n="8deeb9c823dc56953005eef28f08e1ae8e950a5ddcdf5af3be9c52d2b23e5e32/fa" data-source="--signoff" onmousemove="i18n(this)">--signoff</span></dt> <dd> <p><span data-i18n="b055df0ea70a8b4872800c3f1d491dbc61aa3cf86ca3df47fdd9f6ee3f91063b/d8" data-source="Add a &lt;code&gt;Signed-off-by&lt;/code&gt; trailer to the commit message, using the committer identity of yourself. See the signoff option in &lt;a href=&quot;git-commit&quot;&gt;git-commit[1]&lt;/a&gt; for more information." onmousemove="i18n(this)">&Dcy;&ocy;&bcy;&acy;&vcy;&softcy;&tcy;&iecy; &tcy;&rcy;&iecy;&jcy;&lcy;&iecy;&rcy;  <code>Signed-off-by</code>  &kcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yucy; &ocy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &scy;&vcy;&ocy;&yucy; &lcy;&icy;&chcy;&ncy;&ocy;&scy;&tcy;&softcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&tcy;&iecy;&rcy;&acy;. &Dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ucy;&yucy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yucy; &scy;&mcy;. &vcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy; &laquo;&Vcy;&ycy;&pcy;&icy;&scy;&kcy;&acy;&raquo; &vcy;  <a href="git-commit.html">git-commit[1]</a> .</span></p> </dd> <dt id="Documentation/git-am.txt--k"><span data-i18n="2491456786e2f980156bb6d6932d5f25deea5b8b234c1a89766ff9280ab1f280/02" data-source="-k" onmousemove="i18n(this)">-k</span></dt> <dt id="Documentation/git-am.txt---keep"><span data-i18n="ad8e4cbae591ad249ce8e2aba49d9676fbb2a16a7520506a682b1418ae1ad979/0b" data-source="--keep" onmousemove="i18n(this)">--keep</span></dt> <dd> <p><span data-i18n="ab96100e51db0b3151b17377ec96e72a680c79f9ecab6000516502f85f04b176/3e" data-source="Pass &lt;code&gt;-k&lt;/code&gt; flag to &lt;code&gt;git mailinfo&lt;/code&gt; (see &lt;a href=&quot;git-mailinfo&quot;&gt;git-mailinfo[1]&lt;/a&gt;)." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&dcy;&acy;&jcy;&tcy;&iecy; &fcy;&lcy;&acy;&gcy;  <code>-k</code>  &vcy;  <code>git mailinfo</code>  (&scy;&mcy;.  <a href="git-mailinfo.html">git-mailinfo[1]</a> ).</span></p> </dd> <dt id="Documentation/git-am.txt---keep-non-patch"><span data-i18n="2d38cfb0b8f45418f6381c658d65fc13501b726a4b2111fa926a56c323039a02/d0" data-source="--keep-non-patch" onmousemove="i18n(this)">--keep-non-patch</span></dt> <dd> <p><span data-i18n="3aa0fd32d296332defa348495ceef3b29551b3ff12ca66fefa091f70bba10cbc/dc" data-source="Pass &lt;code&gt;-b&lt;/code&gt; flag to &lt;code&gt;git mailinfo&lt;/code&gt; (see &lt;a href=&quot;git-mailinfo&quot;&gt;git-mailinfo[1]&lt;/a&gt;)." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&dcy;&acy;&jcy;&tcy;&iecy; &fcy;&lcy;&acy;&gcy;  <code>-b</code>  &vcy;  <code>git mailinfo</code>  (&scy;&mcy;.  <a href="git-mailinfo.html">git-mailinfo[1]</a> ).</span></p> </dd> <dt id="Documentation/git-am.txt---no-keep-cr"><span data-i18n="2fd1abc97d8a5060fa8df3b550cefbdbef4bbcecda17707124906bc44d8b56fc/f2" data-source="--[no-]keep-cr" onmousemove="i18n(this)">--[no-]keep-cr</span></dt> <dd> <p><span data-i18n="56a73556c6480e1253c905d385ec8c9970178a107a6182c000c646eedd516509/a7" data-source="With &lt;code&gt;--keep-cr&lt;/code&gt;, call &lt;code&gt;git mailsplit&lt;/code&gt; (see &lt;a href=&quot;git-mailsplit&quot;&gt;git-mailsplit[1]&lt;/a&gt;) with the same option, to prevent it from stripping CR at the end of lines. &lt;code&gt;am.keepcr&lt;/code&gt; configuration variable can be used to specify the default behaviour. &lt;code&gt;--no-keep-cr&lt;/code&gt; is useful to override &lt;code&gt;am.keepcr&lt;/code&gt;." onmousemove="i18n(this)">&Pcy;&rcy;&icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&icy;  <code>--keep-cr</code>  &vcy;&ycy;&zcy;&ocy;&vcy;&icy;&tcy;&iecy;  <code>git mailsplit</code>  (&scy;&mcy;.  <a href="git-mailsplit.html">git-mailsplit[1]</a> ) &scy; &tcy;&ocy;&jcy; &zhcy;&iecy; &ocy;&pcy;&tscy;&icy;&iecy;&jcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&rcy;&iecy;&dcy;&ocy;&tcy;&vcy;&rcy;&acy;&tcy;&icy;&tcy;&softcy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&icy;&iecy; CR &vcy; &kcy;&ocy;&ncy;&tscy;&iecy; &scy;&tcy;&rcy;&ocy;&kcy;. &Pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>am.keepcr</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yacy; &pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;.  <code>--no-keep-cr</code>  &pcy;&ocy;&lcy;&iecy;&zcy;&iecy;&ncy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy;  <code>am.keepcr</code> .</span></p> </dd> <dt id="Documentation/git-am.txt--c"><span data-i18n="0c3603e13e24a40b4bf215e3795a9a40d60a8456fb7b63c2d11e81701a231e85/4d" data-source="-c" onmousemove="i18n(this)">-c</span></dt> <dt id="Documentation/git-am.txt---scissors"><span data-i18n="617591e17acf5614bfea0e5581fb1cb3822f04e22e71ca234e0a24175917beb8/df" data-source="--scissors" onmousemove="i18n(this)">--scissors</span></dt> <dd> <p><span data-i18n="a1a2b062a525f2100d117716e344e8d2f6fea6096e70fde8e0f785ecbf90edb8/0c" data-source="Remove everything in body before a scissors line (see &lt;a href=&quot;git-mailinfo&quot;&gt;git-mailinfo[1]&lt;/a&gt;). Can be activated by default using the &lt;code&gt;mailinfo.scissors&lt;/code&gt; configuration variable." onmousemove="i18n(this)">&Ucy;&dcy;&acy;&lcy;&icy;&tcy;&iecy; &vcy;&scy;&iecy; &vcy;&ncy;&ucy;&tcy;&rcy;&icy; &kcy;&ocy;&rcy;&pcy;&ucy;&scy;&acy; &pcy;&iecy;&rcy;&iecy;&dcy; &ncy;&ocy;&zhcy;&ncy;&icy;&tscy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ncy;&ocy;&jcy; &lcy;&icy;&ncy;&icy;&iecy;&jcy; (&scy;&mcy;.  <a href="git-mailinfo.html">git-mailinfo[1]</a> ). &Mcy;&ocy;&zhcy;&iecy;&tcy; &bcy;&ycy;&tcy;&softcy; &acy;&kcy;&tcy;&icy;&vcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>mailinfo.scissors</code> .</span></p> </dd> <dt id="Documentation/git-am.txt---no-scissors"><span data-i18n="306b92d705f6e8745525ae18035bfa20c64762a8cb19630ceda32181ca9b3e48/42" data-source="--no-scissors" onmousemove="i18n(this)">--no-scissors</span></dt> <dd> <p><span data-i18n="ac6d80bff4e249a92f892cd0f76424c2755d0d210d3abb1935f8f30f1472ad20/f1" data-source="Ignore scissors lines (see &lt;a href=&quot;git-mailinfo&quot;&gt;git-mailinfo[1]&lt;/a&gt;)." onmousemove="i18n(this)">&Ncy;&iecy; &ocy;&bcy;&rcy;&acy;&shchcy;&acy;&jcy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&yacy; &ncy;&acy; &ncy;&ocy;&zhcy;&ncy;&icy;&chcy;&ncy;&ycy;&iecy; &lcy;&icy;&ncy;&icy;&icy; (&scy;&mcy;.  <a href="git-mailinfo.html">git-mailinfo[1]</a> ).</span></p> </dd> <dt id="Documentation/git-am.txt---quoted-crltactiongt"><span data-i18n="36cdbc927c0f2f768455f071479da87d0b994db33423d5a682610b4d3cd5daa6/62" data-source="--quoted-cr=&amp;lt;action&amp;gt;" onmousemove="i18n(this)">--quoted-cr=&lt;action&gt;</span></dt> <dd> <p><span data-i18n="03e81f7aae2feceb7afedded43678c36b5ba4b3b72914d1477871cbc6e6eee28/48" data-source="This flag will be passed down to &lt;code&gt;git mailinfo&lt;/code&gt; (see &lt;a href=&quot;git-mailinfo&quot;&gt;git-mailinfo[1]&lt;/a&gt;)." onmousemove="i18n(this)">&Ecy;&tcy;&ocy;&tcy; &fcy;&lcy;&acy;&gcy; &bcy;&ucy;&dcy;&iecy;&tcy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&ncy;  <code>git mailinfo</code>  (&scy;&mcy;.  <a href="git-mailinfo.html">git-mailinfo[1]</a> ).</span></p> </dd> <dt id="Documentation/git-am.txt---emptystopdropkeep"><span data-i18n="ef0c95af475bcecd5983297fa4c0051674f00f1781252d8bed6e1167b02fd92f/cd" data-source="--empty=(stop|drop|keep)" onmousemove="i18n(this)">--empty=(stop|drop|keep)</span></dt> <dd> <p><span data-i18n="ae43c37349f5acd5c66988eac892e7b701b846c1979f98185fe75bf869392c18/56" data-source="By default, or when the option is set to &lt;code&gt;stop&lt;/code&gt;, the command errors out on an input e-mail message lacking a patch and stops in the middle of the current am session. When this option is set to &lt;code&gt;drop&lt;/code&gt;, skip such an e-mail message instead. When this option is set to &lt;code&gt;keep&lt;/code&gt;, create an empty commit, recording the contents of the e-mail message as its log." onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&lcy;&icy; &iecy;&scy;&lcy;&icy; &dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&acy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>stop</code>  , &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &vcy;&ycy;&dcy;&acy;&iecy;&tcy; &ocy;&shcy;&icy;&bcy;&kcy;&ucy; &pcy;&rcy;&icy; &vcy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&mcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&icy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ocy;&jcy; &pcy;&ocy;&chcy;&tcy;&ycy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&mcy; &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;, &icy; &ocy;&scy;&tcy;&acy;&ncy;&acy;&vcy;&lcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy; &scy;&iecy;&rcy;&iecy;&dcy;&icy;&ncy;&iecy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&gcy;&ocy; &scy;&iecy;&acy;&ncy;&scy;&acy; &ucy;&tcy;&rcy;&acy;. &IEcy;&scy;&lcy;&icy; &dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&acy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>drop</code> , &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy; &pcy;&rcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&iecy; &tcy;&acy;&kcy;&ocy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ocy;&jcy; &pcy;&ocy;&chcy;&tcy;&ycy;. &IEcy;&scy;&lcy;&icy; &dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&acy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>keep</code>  , &scy;&ocy;&zcy;&dcy;&acy;&jcy;&tcy;&iecy; &pcy;&ucy;&scy;&tcy;&ucy;&yucy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy;, &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&yacy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ocy;&jcy; &pcy;&ocy;&chcy;&tcy;&ycy; &vcy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;.</span></p> </dd> <dt id="Documentation/git-am.txt--m"><span data-i18n="c4e153afb4aeaa5818fb08325ebff59f883a0482006aa3cc1c17c9b393e54efa/11" data-source="-m" onmousemove="i18n(this)">-m</span></dt> <dt id="Documentation/git-am.txt---message-id"><span data-i18n="e3e0c8f01873f02e10c4ff19a712b02254da05811ac5874d9a3f18162a9a6498/61" data-source="--message-id" onmousemove="i18n(this)">--message-id</span></dt> <dd> <p><span data-i18n="e1c59a98e33965b6e02c34bf4c64abd69c8f5de1baf40d93abe68897d1eb4262/86" data-source="Pass the &lt;code&gt;-m&lt;/code&gt; flag to &lt;code&gt;git mailinfo&lt;/code&gt; (see &lt;a href=&quot;git-mailinfo&quot;&gt;git-mailinfo[1]&lt;/a&gt;), so that the Message-ID header is added to the commit message. The &lt;code&gt;am.messageid&lt;/code&gt; configuration variable can be used to specify the default behaviour." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&dcy;&acy;&jcy;&tcy;&iecy; &fcy;&lcy;&acy;&gcy;  <code>-m</code>  &vcy;  <code>git mailinfo</code>  (&scy;&mcy;.  <a href="git-mailinfo.html">git-mailinfo[1]</a> ), &chcy;&tcy;&ocy;&bcy;&ycy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&ocy;&kcy; Message-ID &bcy;&ycy;&lcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy; &vcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;. &Pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>am.messageid</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yacy; &pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;.</span></p> </dd> <dt id="Documentation/git-am.txt---no-message-id"><span data-i18n="ebd4d9ad677c11701558f3f225ab4db520331962fb79b9f051fac045f0591a16/91" data-source="--no-message-id" onmousemove="i18n(this)">--no-message-id</span></dt> <dd> <p><span data-i18n="c545563a59f1142b13705f9961af55f8bf44ba2e6dc485fd8d3736a0fea46717/80" data-source="Do not add the Message-ID header to the commit message. &lt;code&gt;no-message-id&lt;/code&gt; is useful to override &lt;code&gt;am.messageid&lt;/code&gt;." onmousemove="i18n(this)">&Ncy;&iecy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&yacy;&jcy;&tcy;&iecy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&ocy;&kcy; Message-ID &vcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;.  <code>no-message-id</code>  &pcy;&ocy;&lcy;&iecy;&zcy;&iecy;&ncy; &dcy;&lcy;&yacy; &zcy;&acy;&mcy;&iecy;&ncy;&ycy;  <code>am.messageid</code> .</span></p> </dd> <dt id="Documentation/git-am.txt--q"><span data-i18n="5ce681666a15a41274346f65b8bcbf56f8e8170ac00706a44a09ee4d786a8609/cd" data-source="-q" onmousemove="i18n(this)">-q</span></dt> <dt id="Documentation/git-am.txt---quiet"><span data-i18n="b00818cdc507640687732769ee1cb501db377927ee76d03df23978bd0d706888/e2" data-source="--quiet" onmousemove="i18n(this)">--quiet</span></dt> <dd> <p><span data-i18n="df34c92a8d65d8f96caa5e92722b8c33b0d8a834a2dafc1ba7230fe4c85d9941/8b" data-source="Be quiet. Only print error messages." onmousemove="i18n(this)">&Bcy;&ucy;&dcy;&softcy; &scy;&pcy;&ocy;&kcy;&ocy;&iecy;&ncy;. &Pcy;&iecy;&chcy;&acy;&tcy;&acy;&jcy;&tcy;&iecy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ocy;&bcy; &ocy;&shcy;&icy;&bcy;&kcy;&acy;&khcy;.</span></p> </dd> <dt id="Documentation/git-am.txt--u"><span data-i18n="99f14531f2599afdb9ace38c18c10740fd29ca1bdcdb7d0460fd799001d567bd/0f" data-source="-u" onmousemove="i18n(this)">-u</span></dt> <dt id="Documentation/git-am.txt---utf8"><span data-i18n="2e98e76aebbc43afbea55ae98f6833af0f8478a240f14d14ef210b1fc5a8ee3d/1e" data-source="--utf8" onmousemove="i18n(this)">--utf8</span></dt> <dd> <p><span data-i18n="741ab8dc84de8a376df9e2655110e755189fdc43fad71cbb6d9f9c6a92402ddb/e2" data-source="Pass &lt;code&gt;-u&lt;/code&gt; flag to &lt;code&gt;git mailinfo&lt;/code&gt; (see &lt;a href=&quot;git-mailinfo&quot;&gt;git-mailinfo[1]&lt;/a&gt;). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable &lt;code&gt;i18n.commitEncoding&lt;/code&gt; can be used to specify the project&amp;rsquo;s preferred encoding if it is not UTF-8)." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&dcy;&acy;&jcy;&tcy;&iecy; &fcy;&lcy;&acy;&gcy;  <code>-u</code>  &vcy;  <code>git mailinfo</code>  (&scy;&mcy;.  <a href="git-mailinfo.html">git-mailinfo[1]</a> ). &Pcy;&rcy;&iecy;&dcy;&lcy;&acy;&gcy;&acy;&iecy;&mcy;&ocy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &vcy;&zcy;&yacy;&tcy;&ocy;&iecy; &icy;&zcy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ocy;&gcy;&ocy; &pcy;&icy;&scy;&softcy;&mcy;&acy;, &pcy;&iecy;&rcy;&iecy;&kcy;&ocy;&dcy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&ucy; UTF-8 (&pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>i18n.commitEncoding</code>  &mcy;&ocy;&zhcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &dcy;&lcy;&yacy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yacy; &pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&chcy;&tcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&jcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&icy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&acy;, &iecy;&scy;&lcy;&icy; &ocy;&ncy;&acy; &ncy;&iecy; UTF-8).</span></p> <p><span data-i18n="f57293e55c241203bfe35e848d058b8a9cc465a665703c2647662021c2f19b65/79" data-source="This was optional in prior versions of git, but now it is the default. You can use &lt;code&gt;--no-utf8&lt;/code&gt; to override this." onmousemove="i18n(this)">&Vcy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&icy;&khcy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;&khcy; git &ecy;&tcy;&ocy; &bcy;&ycy;&lcy;&ocy; &ncy;&iecy;&ocy;&bcy;&yacy;&zcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;, &ncy;&ocy; &tcy;&iecy;&pcy;&iecy;&rcy;&softcy; &ecy;&tcy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;. &Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;  <code>--no-utf8</code> , &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &ecy;&tcy;&ocy;.</span></p> </dd> <dt id="Documentation/git-am.txt---no-utf8"><span data-i18n="56766814a3aa7c7427f4a5847a1e6b15efe55d16090993311a6c814c98d11367/8c" data-source="--no-utf8" onmousemove="i18n(this)">--no-utf8</span></dt> <dd> <p><span data-i18n="b09424a523f81b84f33d0f0ded84d329fcfe0ac145c9dd809851a227e37d68ba/0a" data-source="Pass &lt;code&gt;-n&lt;/code&gt; flag to &lt;code&gt;git mailinfo&lt;/code&gt; (see &lt;a href=&quot;git-mailinfo&quot;&gt;git-mailinfo[1]&lt;/a&gt;)." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&dcy;&acy;&jcy;&tcy;&iecy; &fcy;&lcy;&acy;&gcy;  <code>-n</code>  &vcy;  <code>git mailinfo</code>  (&scy;&mcy;.  <a href="git-mailinfo.html">git-mailinfo[1]</a> ).</span></p> </dd> <dt id="Documentation/git-am.txt--3"><span data-i18n="615bdd17c2556f82f384392ea8557f8cc88b03501c759e23093ab0b2a9b5cd48/ab" data-source="-3" onmousemove="i18n(this)">-3</span></dt> <dt id="Documentation/git-am.txt---3way"><span data-i18n="bce76bdb7e3d4f090ab05e4b1bb67d7405fb78c283da4488a58589763c7eaf24/83" data-source="--3way" onmousemove="i18n(this)">--3way</span></dt> <dt id="Documentation/git-am.txt---no-3way"><span data-i18n="4c7394de5546cfe62ac051616f6686a2129932348ee5af65367a6fe94d160652/a2" data-source="--no-3way" onmousemove="i18n(this)">--no-3way</span></dt> <dd> <p><span data-i18n="81cad0efa3d2240f2868d26e4b89bfdb08ef348f71fe05addd85678720764041/d5" data-source="When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally. &lt;code&gt;--no-3way&lt;/code&gt; can be used to override am.threeWay configuration variable. For more information, see am.threeWay in &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt;." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &ncy;&iecy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &kcy;&ocy;&rcy;&rcy;&iecy;&kcy;&tcy;&ncy;&ocy;, &vcy;&iecy;&rcy;&ncy;&icy;&tcy;&iecy;&scy;&softcy; &kcy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&mcy;&ucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yucy;, &iecy;&scy;&lcy;&icy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &icy;&dcy;&iecy;&ncy;&tcy;&icy;&fcy;&icy;&kcy;&acy;&tcy;&ocy;&rcy;&ycy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&khcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&khcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ocy;&vcy;, &kcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &ocy;&ncy;&ocy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ocy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&tcy;&softcy;&scy;&yacy;, &icy; &ecy;&tcy;&icy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&iecy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ycy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy; &lcy;&ocy;&kcy;&acy;&lcy;&softcy;&ncy;&ocy;.  <code>--no-3way</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy; am.threeWay. &Dcy;&lcy;&yacy; &pcy;&ocy;&lcy;&ucy;&chcy;&iecy;&ncy;&icy;&yacy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&jcy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&icy; &scy;&mcy;. am.threeWay &vcy;  <a href="git-config.html">git-config[1]</a> .</span></p> </dd> <dt id="Documentation/git-am.txt---rerere-autoupdate"><span data-i18n="43c74f65e0d9d1c69438db1ed03d4e5e5863408a6674c1e9d6831d14543668fe/7a" data-source="--rerere-autoupdate" onmousemove="i18n(this)">--rerere-autoupdate</span></dt> <dt id="Documentation/git-am.txt---no-rerere-autoupdate"><span data-i18n="2ff823999087968f494b4f32b8d55be1e46326b3680d2fb17d3e8929ec491196/09" data-source="--no-rerere-autoupdate" onmousemove="i18n(this)">--no-rerere-autoupdate</span></dt> <dd> <p><span data-i18n="854915326a4a41d6390df56a9d3d1487178d7eddd59fb5fbc6317b45374a5b2c/a6" data-source="After the rerere mechanism reuses a recorded resolution on the current conflict to update the files in the working tree, allow it to also update the index with the result of resolution. &lt;code&gt;--no-rerere-autoupdate&lt;/code&gt; is a good way to double-check what &lt;code&gt;rerere&lt;/code&gt; did and catch potential mismerges, before committing the result to the index with a separate &lt;code&gt;git add&lt;/code&gt;." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &tcy;&ocy;&gcy;&ocy;, &kcy;&acy;&kcy; &mcy;&iecy;&khcy;&acy;&ncy;&icy;&zcy;&mcy; rerere &pcy;&ocy;&vcy;&tcy;&ocy;&rcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &zcy;&acy;&pcy;&icy;&scy;&acy;&ncy;&ncy;&ocy;&iecy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&iecy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&gcy;&ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy; &dcy;&lcy;&yacy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;, &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&iecy; &iecy;&mcy;&ucy; &tcy;&acy;&kcy;&zhcy;&iecy; &ocy;&bcy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy; &scy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&ocy;&mcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy;.  <code>--no-rerere-autoupdate</code>  &mdash; &khcy;&ocy;&rcy;&ocy;&shcy;&icy;&jcy; &scy;&pcy;&ocy;&scy;&ocy;&bcy; &pcy;&iecy;&rcy;&iecy;&pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&icy;&tcy;&softcy; &tcy;&ocy;, &chcy;&tcy;&ocy; &scy;&dcy;&iecy;&lcy;&acy;&lcy;  <code>rerere</code> , &icy; &vcy;&ycy;&yacy;&vcy;&icy;&tcy;&softcy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ycy;&iecy; &ocy;&shcy;&icy;&bcy;&kcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &pcy;&rcy;&iecy;&zhcy;&dcy;&iecy; &chcy;&iecy;&mcy; &zcy;&acy;&ncy;&ocy;&scy;&icy;&tcy;&softcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ocy;&tcy;&dcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy;  <code>git add</code> .</span></p> </dd> <dt id="Documentation/git-am.txt---ignore-space-change"><span data-i18n="d4e4651d4bd56f6ecb4a953585b2b9c22e5c24821a93229916cb80a777f82866/61" data-source="--ignore-space-change" onmousemove="i18n(this)">--ignore-space-change</span></dt> <dt id="Documentation/git-am.txt---ignore-whitespace"><span data-i18n="36566985c3cd427bca35a5990cbf1bde8d4022e9f183cc87724768ebb399c8c5/fe" data-source="--ignore-whitespace" onmousemove="i18n(this)">--ignore-whitespace</span></dt> <dt id="Documentation/git-am.txt---whitespaceltactiongt"><span data-i18n="cbd5504b502622093dffc970cdd2a5cea0801fa6e9f2381b8b9944640e4c2b20/92" data-source="--whitespace=&amp;lt;action&amp;gt;" onmousemove="i18n(this)">--whitespace=&lt;action&gt;</span></dt> <dt id="Documentation/git-am.txt--Cltngt"><span data-i18n="28dfc08a4753ddcdaa7195e40407151f2e3f0fee783b2765300019fbca24db75/bc" data-source="-C&amp;lt;n&amp;gt;" onmousemove="i18n(this)">-C&lt;n&gt;</span></dt> <dt id="Documentation/git-am.txt--pltngt"><span data-i18n="524a36047bd83eaf2e468e0d81109688b59a5bf3609250c92d207a8ff37c27e3/bf" data-source="-p&amp;lt;n&amp;gt;" onmousemove="i18n(this)">-p&lt;n&gt;</span></dt> <dt id="Documentation/git-am.txt---directoryltdirgt"><span data-i18n="cb1c8748a0f2a02944ea414825649446d6775c7e80103d3384ff9073e898ba3f/60" data-source="--directory=&amp;lt;dir&amp;gt;" onmousemove="i18n(this)">--directory=&lt;dir&gt;</span></dt> <dt id="Documentation/git-am.txt---excludeltpathgt"><span data-i18n="a0ec24b07934440209f1a1e8daa11001eb7f39e4d209397f47e23f47459612fb/ef" data-source="--exclude=&amp;lt;path&amp;gt;" onmousemove="i18n(this)">--exclude=&lt;path&gt;</span></dt> <dt id="Documentation/git-am.txt---includeltpathgt"><span data-i18n="5ce19cc391bac7713929ff53a83c6f7ec1b9793a52dfbcf6d02ded893011e25b/67" data-source="--include=&amp;lt;path&amp;gt;" onmousemove="i18n(this)">--include=&lt;path&gt;</span></dt> <dt id="Documentation/git-am.txt---reject"><span data-i18n="2d48b72c20d2661068e5fbe62f7746664b9db3a8d8e293a30c140eb8fb5b136c/a1" data-source="--reject" onmousemove="i18n(this)">--reject</span></dt> <dd> <p><span data-i18n="08e68f7d1cc0459749c79d0353d4b176d2a02da3d48d816a85145d6f5d38067a/1e" data-source="These flags are passed to the &lt;code&gt;git apply&lt;/code&gt; (see &lt;a href=&quot;git-apply&quot;&gt;git-apply[1]&lt;/a&gt;) program that applies the patch." onmousemove="i18n(this)">&Ecy;&tcy;&icy; &fcy;&lcy;&acy;&gcy;&icy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&yucy;&tcy;&scy;&yacy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&iecy;  <code>git apply</code>  (&scy;&mcy;.  <a href="git-apply.html">git-apply[1]</a> ), &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;.</span></p> </dd> <dt id="Documentation/git-am.txt---patch-format"><span data-i18n="43c076d8987a7948eb8da900d62079b6d7bcfeabbce0c89ed793757e37f9b56c/51" data-source="--patch-format" onmousemove="i18n(this)">--patch-format</span></dt> <dd> <p><span data-i18n="ec1bfa574b8e82e84c70a47cbc576a60010150186f278b84ac3bae2f71dc9098/cf" data-source="By default the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, stgit, stgit-series, and hg." onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &pcy;&ocy;&pcy;&ycy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy; &pcy;&acy;&tcy;&chcy;&acy;. &Ecy;&tcy;&acy; &ocy;&pcy;&tscy;&icy;&yacy; &pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&iecy;&tcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &ocy;&bcy;&ocy;&jcy;&tcy;&icy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&iecy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&iecy; &icy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &icy;&ncy;&tcy;&iecy;&rcy;&pcy;&rcy;&iecy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy;. &Dcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&mcy;&ycy;&iecy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&ycy;: mbox, mboxrd, stgit, stgit-series &icy; hg.</span></p> </dd> <dt id="Documentation/git-am.txt--i"><span data-i18n="444c8974fcf3d4d990db382d0a6ed1d69ffc4caa10da28afd7ab561fd7f27ced/9f" data-source="-i" onmousemove="i18n(this)">-i</span></dt> <dt id="Documentation/git-am.txt---interactive"><span data-i18n="8de13a6788f37255da5b35cac31b207d90b4219bd9af6d3da5bc2a30a027dae9/6e" data-source="--interactive" onmousemove="i18n(this)">--interactive</span></dt> <dd> <p><span data-i18n="722a81d2a977eb999566657ced65c7c89825ce76bdf47461064b3f0c91b92172/03" data-source="Run interactively." onmousemove="i18n(this)">Run interactively.</span></p> </dd> <dt id="Documentation/git-am.txt--n"><span data-i18n="5249f4fcc629efa0e6d6b2bf746b6c5de61611ce719ad61ac820fbe5c8cece66/28" data-source="-n" onmousemove="i18n(this)">-n</span></dt> <dt id="Documentation/git-am.txt---no-verify"><span data-i18n="e47e76424ae98da0a14e422348b37cfc15549f36aedcd7ffa0e6ddb142b25d33/d7" data-source="--no-verify" onmousemove="i18n(this)">--no-verify</span></dt> <dd> <p><span data-i18n="9be67309c784fe5f754bf10157a2db6a246d657ddfe5427de795de9f4c3d8d72/ff" data-source="By default, the pre-applypatch and applypatch-msg hooks are run. When any of &lt;code&gt;--no-verify&lt;/code&gt; or &lt;code&gt;-n&lt;/code&gt; is given, these are bypassed. See also &lt;a href=&quot;githooks&quot;&gt;githooks[5]&lt;/a&gt;." onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&yucy;&tcy;&scy;&yacy; &pcy;&iecy;&rcy;&iecy;&khcy;&vcy;&acy;&tcy;&chcy;&icy;&kcy;&icy; pre-applypatch &icy; applypatch-msg. &IEcy;&scy;&lcy;&icy; &zcy;&acy;&dcy;&acy;&ncy; &lcy;&yucy;&bcy;&ocy;&jcy; &icy;&zcy;  <code>--no-verify</code>  &icy;&lcy;&icy;  <code>-n</code> , &ocy;&ncy;&icy; &icy;&gcy;&ncy;&ocy;&rcy;&icy;&rcy;&ucy;&yucy;&tcy;&scy;&yacy;. &Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;  <a href="githooks.html">githooks[5]</a> .</span></p> </dd> <dt id="Documentation/git-am.txt---committer-date-is-author-date"><span data-i18n="43eeda00109570d4e91c67f5a7e68d9fe97cdde3214c15ea6764011470b212d3/ce" data-source="--committer-date-is-author-date" onmousemove="i18n(this)">--committer-date-is-author-date</span></dt> <dd> <p><span data-i18n="85ee3512d19e9ec50bfb6cb01e4fe7957c20a7f77f71f7dc6967bb52b10c2faa/24" data-source="By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the committer date by using the same value as the author date." onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &dcy;&acy;&tcy;&ucy; &icy;&zcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ocy;&jcy; &pcy;&ocy;&chcy;&tcy;&ycy; &kcy;&acy;&kcy; &dcy;&acy;&tcy;&ucy; &acy;&vcy;&tcy;&ocy;&rcy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &vcy;&rcy;&iecy;&mcy;&yacy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&yacy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &dcy;&acy;&tcy;&ycy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&tcy;&iecy;&rcy;&acy;. &Ecy;&tcy;&ocy; &pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&iecy;&tcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &lcy;&gcy;&acy;&tcy;&softcy; &ocy; &dcy;&acy;&tcy;&iecy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&tcy;&iecy;&rcy;&acy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &tcy;&ocy; &zhcy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &icy; &dcy;&acy;&tcy;&acy; &acy;&vcy;&tcy;&ocy;&rcy;&acy;.</span></p> </dd> <dt id="Documentation/git-am.txt---ignore-date"><span data-i18n="51b2fcd42cb1910c9c74a74966041db2d0eb78b31b715b3fc500833c99fd4a30/9a" data-source="--ignore-date" onmousemove="i18n(this)">--ignore-date</span></dt> <dd> <p><span data-i18n="d2aeaf7791ac560557c4f20e3ef06165af9938c60aa551719ac6815b576b09dc/61" data-source="By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the author date by using the same value as the committer date." onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &dcy;&acy;&tcy;&ucy; &icy;&zcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ocy;&jcy; &pcy;&ocy;&chcy;&tcy;&ycy; &kcy;&acy;&kcy; &dcy;&acy;&tcy;&ucy; &acy;&vcy;&tcy;&ocy;&rcy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &vcy;&rcy;&iecy;&mcy;&yacy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&yacy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &dcy;&acy;&tcy;&ycy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&tcy;&iecy;&rcy;&acy;. &Ecy;&tcy;&ocy; &pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&iecy;&tcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &lcy;&gcy;&acy;&tcy;&softcy; &ocy; &dcy;&acy;&tcy;&iecy; &acy;&vcy;&tcy;&ocy;&rcy;&acy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &tcy;&ocy; &zhcy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &icy; &dcy;&acy;&tcy;&acy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&tcy;&iecy;&rcy;&acy;.</span></p> </dd> <dt id="Documentation/git-am.txt---skip"><span data-i18n="142b6595e1235637a0b29a91970a8847aab333d1aa6ebb6349ec8d32fe2026b0/08" data-source="--skip" onmousemove="i18n(this)">--skip</span></dt> <dd> <p><span data-i18n="0663e76f5779b5d9ed6a84c17ea298584985c77b668874860640c0846b081075/79" data-source="Skip the current patch. This is only meaningful when restarting an aborted patch." onmousemove="i18n(this)">&Pcy;&rcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&softcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&icy;&jcy; &pcy;&acy;&tcy;&chcy;. &Ecy;&tcy;&ocy; &icy;&mcy;&iecy;&iecy;&tcy; &scy;&mcy;&ycy;&scy;&lcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &pcy;&rcy;&icy; &pcy;&iecy;&rcy;&iecy;&zcy;&acy;&pcy;&ucy;&scy;&kcy;&iecy; &pcy;&rcy;&iecy;&rcy;&vcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &pcy;&acy;&tcy;&chcy;&acy;.</span></p> </dd> <dt id="Documentation/git-am.txt--Sltkeyidgt"><span data-i18n="81022e0227a476cb39b3c7536e8861d916ea9462349bdbb91fe1f1ee856622ff/ad" data-source="-S[&amp;lt;keyid&amp;gt;]" onmousemove="i18n(this)">-S[&lt;keyid&gt;]</span></dt> <dt id="Documentation/git-am.txt---gpg-signltkeyidgt"><span data-i18n="df48474147c9c7172d8f1029beb425f8566e8a840580f02b664cfd0a332db8e6/2e" data-source="--gpg-sign[=&amp;lt;keyid&amp;gt;]" onmousemove="i18n(this)">--gpg-sign[=&lt;keyid&gt;]</span></dt> <dt id="Documentation/git-am.txt---no-gpg-sign"><span data-i18n="08f741608de1fc2eb2af984114e38f3f6852b5d615634c4e27dffda230a0220e/ee" data-source="--no-gpg-sign" onmousemove="i18n(this)">--no-gpg-sign</span></dt> <dd> <p><span data-i18n="9fe40652f924289c50713764fdfcd723591e2214b07842c244b4612d52d216a6/47" data-source="GPG-sign commits. The &lt;code&gt;keyid&lt;/code&gt; argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. &lt;code&gt;--no-gpg-sign&lt;/code&gt; is useful to countermand both &lt;code&gt;commit.gpgSign&lt;/code&gt; configuration variable, and earlier &lt;code&gt;--gpg-sign&lt;/code&gt;." onmousemove="i18n(this)">GPG-&zcy;&ncy;&acy;&kcy; &fcy;&icy;&kcy;&scy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy;. &Acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy;  <code>keyid</code>  &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &ncy;&iecy;&ocy;&bcy;&yacy;&zcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&mcy; &icy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &icy;&dcy;&iecy;&ncy;&tcy;&icy;&fcy;&icy;&kcy;&acy;&tcy;&ocy;&rcy;&ucy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&tcy;&iecy;&rcy;&acy;; &iecy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ocy;, &ocy;&ncy;&ocy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ocy; &bcy;&ycy;&tcy;&softcy; &pcy;&rcy;&icy;&kcy;&rcy;&iecy;&pcy;&lcy;&iecy;&ncy;&ocy; &kcy; &ocy;&pcy;&tscy;&icy;&icy; &bcy;&iecy;&zcy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&acy;.  <code>--no-gpg-sign</code>  &pcy;&ocy;&lcy;&iecy;&zcy;&iecy;&ncy; &dcy;&lcy;&yacy; &ocy;&tcy;&mcy;&iecy;&ncy;&ycy; &kcy;&acy;&kcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>commit.gpgSign</code> , &tcy;&acy;&kcy; &icy; &bcy;&ocy;&lcy;&iecy;&iecy; &rcy;&acy;&ncy;&ncy;&iecy;&jcy; &vcy;&iecy;&rcy;&scy;&icy;&icy;  <code>--gpg-sign</code> .</span></p> </dd> <dt id="Documentation/git-am.txt---continue"><span data-i18n="a06a8ce6e8eddeea26bb4ce1a5233519275843923fd9619cbd7927cc69da5eb1/28" data-source="--continue" onmousemove="i18n(this)">--continue</span></dt> <dt id="Documentation/git-am.txt--r"><span data-i18n="1e1caaf8cf28cb0243175a8dd26a3fc0d8f2c5527c661586bb816e57b9919be2/c9" data-source="-r" onmousemove="i18n(this)">-r</span></dt> <dt id="Documentation/git-am.txt---resolved"><span data-i18n="98efd8c3375924a4469132e85d68459b121c6b1c91c3a14c985d84333cef1eed/8c" data-source="--resolved" onmousemove="i18n(this)">--resolved</span></dt> <dd> <p><span data-i18n="476fa3a56cfd5aa50d1affd1687ea9674135fa5f10b9dd38bb7c4e0505aa50ea/55" data-source="After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e-mail message and the current index file, and continue." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &scy;&bcy;&ocy;&yacy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &pcy;&rcy;&icy; &pcy;&ocy;&pcy;&ycy;&tcy;&kcy;&iecy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&iecy;&iecy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;) &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&icy;&lcy; &iecy;&gcy;&ocy; &vcy;&rcy;&ucy;&chcy;&ncy;&ucy;&yucy;, &icy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&ncy;&ocy;&mcy; &fcy;&acy;&jcy;&lcy;&iecy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;. &Scy;&dcy;&iecy;&lcy;&acy;&jcy;&tcy;&iecy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &acy;&vcy;&tcy;&ocy;&rcy;&scy;&tcy;&vcy;&ocy; &icy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&ncy;&ycy;&iecy; &icy;&zcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ocy;&jcy; &pcy;&ocy;&chcy;&tcy;&ycy; &icy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&gcy;&ocy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &icy; &pcy;&rcy;&ocy;&dcy;&ocy;&lcy;&zhcy;&acy;&jcy;&tcy;&iecy;.</span></p> </dd> <dt id="Documentation/git-am.txt---resolvemsgltmsggt"><span data-i18n="10805746759e90298d409b73ce43c5731a5811011051456345df3b4bed34c6c9/f7" data-source="--resolvemsg=&amp;lt;msg&amp;gt;" onmousemove="i18n(this)">--resolvemsg=&lt;msg&gt;</span></dt> <dd> <p><span data-i18n="3fe035a3280c11f8ed51644d449b5d9b8f4ee76983c8115f4f146668a980cbd9/5f" data-source="When a patch failure occurs, &amp;lt;msg&amp;gt; will be printed to the screen before exiting. This overrides the standard message informing you to use &lt;code&gt;--continue&lt;/code&gt; or &lt;code&gt;--skip&lt;/code&gt; to handle the failure. This is solely for internal use between &lt;code&gt;git rebase&lt;/code&gt; and &lt;code&gt;git am&lt;/code&gt;." onmousemove="i18n(this)">&Vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &scy;&bcy;&ocy;&yacy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&dcy; &vcy;&ycy;&khcy;&ocy;&dcy;&ocy;&mcy; &ncy;&acy; &ecy;&kcy;&rcy;&acy;&ncy; &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&ycy;&vcy;&iecy;&dcy;&iecy;&ncy;&ocy; &lt;msg&gt;. &Ecy;&tcy;&ocy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ocy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy;, &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&icy;&rcy;&ucy;&yucy;&shchcy;&iecy;&iecy; &vcy;&acy;&scy; &ocy;&bcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&icy;  <code>--continue</code>  &icy;&lcy;&icy;  <code>--skip</code>  &dcy;&lcy;&yacy; &ucy;&scy;&tcy;&rcy;&acy;&ncy;&iecy;&ncy;&icy;&yacy; &scy;&bcy;&ocy;&yacy;. &Ecy;&tcy;&ocy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &dcy;&lcy;&yacy; &vcy;&ncy;&ucy;&tcy;&rcy;&iecy;&ncy;&ncy;&iecy;&gcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &mcy;&iecy;&zhcy;&dcy;&ucy;  <code>git rebase</code>  &icy;  <code>git am</code> .</span></p> </dd> <dt id="Documentation/git-am.txt---abort"><span data-i18n="eea83aeda8cb36a95998ab5eb77be727f99e98311c29a90c13df34ee87991d66/7a" data-source="--abort" onmousemove="i18n(this)">--abort</span></dt> <dd> <p><span data-i18n="e64b6484b5f272a3110006de2f096a5c137df364eb245b42d6d407ff693ff709/e6" data-source="Restore the original branch and abort the patching operation. Revert the contents of files involved in the am operation to their pre-am state." onmousemove="i18n(this)">&Vcy;&ocy;&scy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&iecy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ucy;&yucy; &vcy;&iecy;&tcy;&kcy;&ucy; &icy; &pcy;&rcy;&iecy;&rcy;&vcy;&icy;&tcy;&iecy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&yucy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy;. &Vcy;&iecy;&rcy;&ncy;&icy;&tcy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &ucy;&chcy;&acy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&khcy; &vcy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&icy; am, &vcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&iecy; &dcy;&ocy; &icy;&khcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-am.txt---quit"><span data-i18n="df2c6d5508e1f0a2315e06c6032b8bc76b6e828bc56bbab66d89ec4f71d10f29/e5" data-source="--quit" onmousemove="i18n(this)">--quit</span></dt> <dd> <p><span data-i18n="454eb6626dbb626fe71f1d0153537ab8d92455d3617505d0492247e51adb088b/a1" data-source="Abort the patching operation but keep HEAD and the index untouched." onmousemove="i18n(this)">&Pcy;&rcy;&iecy;&rcy;&vcy;&icy;&tcy;&iecy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&yucy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy;, &ncy;&ocy; &ocy;&scy;&tcy;&acy;&vcy;&softcy;&tcy;&iecy; HEAD &icy; &icy;&ncy;&dcy;&iecy;&kcy;&scy; &ncy;&iecy;&tcy;&rcy;&ocy;&ncy;&ucy;&tcy;&ycy;&mcy;&icy;.</span></p> </dd> <dt id="Documentation/git-am.txt---show-current-patchdiffraw"><span data-i18n="04376cf889951a6005c19bb8f355177ca0bb5d8e28d119e5f7b2071b67ca3320/0c" data-source="--show-current-patch[=(diff|raw)]" onmousemove="i18n(this)">--show-current-patch[=(diff|raw)]</span></dt> <dd> <p><span data-i18n="3954f49823d7ba9abd13c7748947dc627d9d700d08ed8f49d00a72bfe120eacd/58" data-source="Show the message at which &lt;code&gt;git am&lt;/code&gt; has stopped due to conflicts. If &lt;code&gt;raw&lt;/code&gt; is specified, show the raw contents of the e-mail message; if &lt;code&gt;diff&lt;/code&gt;, show the diff portion only. Defaults to &lt;code&gt;raw&lt;/code&gt;." onmousemove="i18n(this)">&Pcy;&ocy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy;, &ncy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&mcy;  <code>git am</code>  &ocy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&lcy;&scy;&yacy; &icy;&zcy;-&zcy;&acy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;. &IEcy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;  <code>raw</code> , &pcy;&ocy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &ncy;&iecy;&ocy;&bcy;&rcy;&acy;&bcy;&ocy;&tcy;&acy;&ncy;&ncy;&ocy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ocy;&jcy; &pcy;&ocy;&chcy;&tcy;&ycy;; &iecy;&scy;&lcy;&icy;  <code>diff</code>  , &pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&tcy;&softcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &chcy;&acy;&scy;&tcy;&softcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  <code>raw</code> .</span></p> </dd> <dt id="Documentation/git-am.txt---allow-empty"><span data-i18n="4c5c1cb42a46fae41c6f4e44631e24be2f480e5d1361d68fe96892ec9b76fd6a/0b" data-source="--allow-empty" onmousemove="i18n(this)">--allow-empty</span></dt> <dd> <p><span data-i18n="fc07593ba111f6790455d9d2d0ceefd6024478d76890ada1824e5032017e996f/7e" data-source="After a patch failure on an input e-mail message lacking a patch, create an empty commit with the contents of the e-mail message as its log message." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &scy;&bcy;&ocy;&yacy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &vcy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ocy;&jcy; &pcy;&ocy;&chcy;&tcy;&ycy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&mcy; &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;, &scy;&ocy;&zcy;&dcy;&acy;&jcy;&tcy;&iecy; &pcy;&ucy;&scy;&tcy;&ucy;&yucy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&yucy; &scy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ycy;&mcy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &ecy;&lcy;&iecy;&kcy;&tcy;&rcy;&ocy;&ncy;&ncy;&ocy;&jcy; &pcy;&ocy;&chcy;&tcy;&ycy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;&acy;.</span></p> </dd> </dl> </div> </div> <h2 class="text-body-emphasis"  id="_discussion"><span data-i18n="5eb6cf647d2c5d14a044e2d103dcef4cf0cdc872434c374debc1043092bc4746/dd" data-source="Discussion" onmousemove="i18n(this)">Discussion</span></h2> <div> <p><span data-i18n="ed347d7a226d17f6bc7b82566fd95d1d964c8eb11eb3eccd462bc1c87db46148/d2" data-source="The commit author name is taken from the &amp;quot;From: &amp;quot; line of the message, and commit author date is taken from the &amp;quot;Date: &amp;quot; line of the message. The &amp;quot;Subject: &amp;quot; line is used as the title of the commit, after stripping common prefix &amp;quot;[PATCH &amp;lt;anything&amp;gt;]&amp;quot;. The &amp;quot;Subject: &amp;quot; line is supposed to concisely describe what the commit is about in one line of text." onmousemove="i18n(this)">&Icy;&mcy;&yacy; &acy;&vcy;&tcy;&ocy;&rcy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &bcy;&iecy;&rcy;&iecy;&tcy;&scy;&yacy; &icy;&zcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;  &quot;From: &quot;  &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy;, &acy; &dcy;&acy;&tcy;&acy; &acy;&vcy;&tcy;&ocy;&rcy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &bcy;&iecy;&rcy;&iecy;&tcy;&scy;&yacy; &icy;&zcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;  &quot;Date: &quot;  &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy;. &Scy;&tcy;&rcy;&ocy;&kcy;&acy;  &quot;Subject: &quot;  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&kcy;&acy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy; &pcy;&ocy;&scy;&lcy;&iecy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&icy;&yacy; &ocy;&bcy;&shchcy;&iecy;&gcy;&ocy; &pcy;&rcy;&iecy;&fcy;&icy;&kcy;&scy;&acy;  &quot;[PATCH &lt;anything&gt;]&quot; . &Scy;&tcy;&rcy;&ocy;&kcy;&acy;  &quot;Subject: &quot;  &dcy;&ocy;&lcy;&zhcy;&ncy;&acy; &kcy;&rcy;&acy;&tcy;&kcy;&ocy; &ocy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&tcy;&softcy; &scy;&ucy;&tcy;&softcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy; &vcy; &ocy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&iecy; &tcy;&iecy;&kcy;&scy;&tcy;&acy;.</span></p> <p><span data-i18n="80976d163f8d7fc8f66f97988df8c9d958eb991662a23a74fcc97c967771f3db/d3" data-source="&amp;quot;From: &amp;quot;, &amp;quot;Date: &amp;quot;, and &amp;quot;Subject: &amp;quot; lines starting the body override the respective commit author name and title values taken from the headers." onmousemove="i18n(this)">&Scy;&tcy;&rcy;&ocy;&kcy;&icy;  &quot;From: &quot; ,  &quot;Date: &quot;  &icy;  &quot;Subject: &quot; , &ncy;&acy;&chcy;&icy;&ncy;&acy;&yucy;&shchcy;&icy;&iecy; &tcy;&iecy;&lcy;&ocy;, &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&yucy;&tcy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&iecy; &icy;&mcy;&yacy; &acy;&vcy;&tcy;&ocy;&rcy;&acy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy; &icy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&kcy;&acy;, &vcy;&zcy;&yacy;&tcy;&ycy;&iecy; &icy;&zcy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&kcy;&ocy;&vcy;.</span></p> <p><span data-i18n="c605ee2323ba2e994708ff26024d4e30dbed22c3e2baf8809f7b4fae302743cd/88" data-source="The commit message is formed by the title taken from the &amp;quot;Subject: &amp;quot;, a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped." onmousemove="i18n(this)">&Scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &ocy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &scy;&ocy;&scy;&tcy;&ocy;&icy;&tcy; &icy;&zcy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&kcy;&acy;, &vcy;&zcy;&yacy;&tcy;&ocy;&gcy;&ocy; &icy;&zcy;  &quot;Subject: &quot; , &pcy;&ucy;&scy;&tcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &icy; &tcy;&iecy;&lcy;&acy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy; &dcy;&ocy; &ncy;&acy;&chcy;&acy;&lcy;&acy; &pcy;&acy;&tcy;&chcy;&acy;. &Lcy;&icy;&shcy;&ncy;&icy;&iecy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&ycy; &vcy; &kcy;&ocy;&ncy;&tscy;&iecy; &kcy;&acy;&zhcy;&dcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &ucy;&dcy;&acy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy;.</span></p> <p><span data-i18n="c1c43f1cfa1ed850ff581f4cb19f45c9cc99062b0e6be0f3364c3f9926f8a939/37" data-source="The patch is expected to be inline, directly following the message. Any line that is of the form:" onmousemove="i18n(this)">&Ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &pcy;&acy;&tcy;&chcy; &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&mcy; &scy;&rcy;&acy;&zcy;&ucy; &pcy;&ocy;&scy;&lcy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&yacy;. &Lcy;&yucy;&bcy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &vcy;&icy;&dcy;&acy;:</span></p> <div> <ul> <li> <p><span data-i18n="bed9b28e8e59a24d552f78c8e57ced9ae25608096faaeb4d4588153e1f9dbd08/d9" data-source="three-dashes and end-of-line, or" onmousemove="i18n(this)">&tcy;&rcy;&icy; &tcy;&icy;&rcy;&iecy; &icy; &kcy;&ocy;&ncy;&iecy;&tscy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &icy;&lcy;&icy;</span></p> </li> <li> <p><span data-i18n="b2b8b2fb474913dee749e5eddf7c30bd7005c2cb80bb1b233e193c1ad94de87a/7e" data-source="a line that begins with &amp;quot;diff -&amp;quot;, or" onmousemove="i18n(this)">&scy;&tcy;&rcy;&ocy;&kcy;&acy;, &ncy;&acy;&chcy;&icy;&ncy;&acy;&yucy;&shchcy;&acy;&yacy;&scy;&yacy; &scy;  &quot;diff -&quot; , &icy;&lcy;&icy;</span></p> </li> <li> <p><span data-i18n="ece3058405004bd3c4fa7cd29f64722c09ad6ec463f3732289ddcf614694f9d3/17" data-source="a line that begins with &amp;quot;Index: &amp;quot;" onmousemove="i18n(this)">&scy;&tcy;&rcy;&ocy;&kcy;&acy;, &ncy;&acy;&chcy;&icy;&ncy;&acy;&yucy;&shchcy;&acy;&yacy;&scy;&yacy; &scy;  &quot;Index: &quot;</span></p> </li> </ul> </div> <p><span data-i18n="f08365ee35fca50654608a7fe6e6a96a6da7e74d71c8a8372e556a54fd8e383e/77" data-source="is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line." onmousemove="i18n(this)">&scy;&chcy;&icy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &ncy;&acy;&chcy;&acy;&lcy;&ocy;&mcy; &pcy;&acy;&tcy;&chcy;&acy;, &icy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy; &zhcy;&ucy;&rcy;&ncy;&acy;&lcy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&acy;&iecy;&tcy;&scy;&yacy; &dcy;&ocy; &pcy;&iecy;&rcy;&vcy;&ocy;&gcy;&ocy; &pcy;&ocy;&yacy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &tcy;&acy;&kcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;.</span></p> <p><span data-i18n="8aa96e799c543c66c82226b49e83e7bb1b3eb7075b85fbc6324150411e5bc5a6/d8" data-source="When initially invoking &lt;code&gt;git am&lt;/code&gt;, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:" onmousemove="i18n(this)">&Pcy;&rcy;&icy; &pcy;&iecy;&rcy;&vcy;&ocy;&ncy;&acy;&chcy;&acy;&lcy;&softcy;&ncy;&ocy;&mcy; &vcy;&ycy;&zcy;&ocy;&vcy;&iecy;  <code>git am</code>  &vcy;&ycy; &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&iecy; &icy;&mcy;&iecy;&ncy;&acy; &pcy;&ocy;&chcy;&tcy;&ocy;&vcy;&ycy;&khcy; &yacy;&shchcy;&icy;&kcy;&ocy;&vcy; &dcy;&lcy;&yacy; &ocy;&bcy;&rcy;&acy;&bcy;&ocy;&tcy;&kcy;&icy;. &Pcy;&rcy;&icy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&icy; &pcy;&iecy;&rcy;&vcy;&ocy;&gcy;&ocy; &pcy;&acy;&tcy;&chcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &ncy;&iecy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy;, &ocy;&ncy; &pcy;&rcy;&iecy;&rcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &pcy;&ocy;&scy;&iecy;&rcy;&iecy;&dcy;&icy;&ncy;&iecy;. &Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &vcy;&ocy;&scy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy;&scy;&yacy; &pcy;&ocy;&scy;&lcy;&iecy; &ecy;&tcy;&ocy;&gcy;&ocy; &ocy;&dcy;&ncy;&icy;&mcy; &icy;&zcy; &dcy;&vcy;&ucy;&khcy; &scy;&pcy;&ocy;&scy;&ocy;&bcy;&ocy;&vcy;:</span></p> <div> <ol> <li> <p><span data-i18n="060cf02fb26db6d3f696ddae2db015b887bc166c3c9f8ffe8fc11a75774c8e35/90" data-source="skip the current patch by re-running the command with the &lt;code&gt;--skip&lt;/code&gt; option." onmousemove="i18n(this)">&pcy;&rcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&iecy; &tcy;&iecy;&kcy;&ucy;&shchcy;&icy;&jcy; &pcy;&acy;&tcy;&chcy;, &pcy;&ocy;&vcy;&tcy;&ocy;&rcy;&ncy;&ocy; &zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&vcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy; &scy; &ocy;&pcy;&tscy;&icy;&iecy;&jcy;  <code>--skip</code> .</span></p> </li> <li> <p><span data-i18n="a3ee797d8d057564003b39a7bb0819ea04e0eb060a932ed43efc1ddd28c5cf4f/78" data-source="hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the &lt;code&gt;--continue&lt;/code&gt; option." onmousemove="i18n(this)">&vcy;&rcy;&ucy;&chcy;&ncy;&ucy;&yucy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy; &icy; &ocy;&bcy;&ncy;&ocy;&vcy;&icy;&tcy;&iecy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&ncy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&rcy;&icy;&vcy;&iecy;&scy;&tcy;&icy; &iecy;&gcy;&ocy; &vcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&iecy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ocy; &bcy;&ycy;&lcy;&ocy; &scy;&ocy;&zcy;&dcy;&acy;&tcy;&softcy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;. &Zcy;&acy;&tcy;&iecy;&mcy; &zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&iecy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy; &scy; &ocy;&pcy;&tscy;&icy;&iecy;&jcy;  <code>--continue</code> .</span></p> </li> </ol> </div> <p><span data-i18n="89f1f3a35e2a3e32e71bc97081a896be54e6462dd22d96761c5895ff482eed4f/47" data-source="The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run &lt;code&gt;git am --abort&lt;/code&gt; before running the command with mailbox names." onmousemove="i18n(this)">&Kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &ocy;&tcy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &ncy;&ocy;&vcy;&ycy;&iecy; &pcy;&ocy;&chcy;&tcy;&ocy;&vcy;&ycy;&iecy; &yacy;&shchcy;&icy;&kcy;&icy; &dcy;&ocy; &tcy;&iecy;&khcy; &pcy;&ocy;&rcy;, &pcy;&ocy;&kcy;&acy; &ncy;&iecy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&icy;&tcy;&scy;&yacy; &tcy;&iecy;&kcy;&ucy;&shchcy;&acy;&yacy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&yacy;, &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &rcy;&iecy;&shcy;&icy;&tcy;&iecy; &ncy;&acy;&chcy;&acy;&tcy;&softcy; &vcy;&scy;&iecy; &scy;&ncy;&acy;&chcy;&acy;&lcy;&acy;, &zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&iecy;  <code>git am --abort</code>  &pcy;&iecy;&rcy;&iecy;&dcy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&ocy;&mcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy; &scy; &icy;&mcy;&iecy;&ncy;&acy;&mcy;&icy; &pcy;&ocy;&chcy;&tcy;&ocy;&vcy;&ycy;&khcy; &yacy;&shchcy;&icy;&kcy;&ocy;&vcy;.</span></p> <p><span data-i18n="e2f2ab9563984879c1bc51e9700c5930b50844d0213ac79468188e4563926e91/53" data-source="Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running &lt;code&gt;git am&lt;/code&gt; on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the &amp;quot;From:&amp;quot; lines)." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&dcy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&iecy;&mcy; &kcy;&acy;&kcy;&icy;&khcy;-&lcy;&icy;&bcy;&ocy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&jcy; ORIG_HEAD &ucy;&scy;&tcy;&acy;&ncy;&acy;&vcy;&lcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &ncy;&acy; &kcy;&ocy;&ncy;&chcy;&icy;&kcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;. &Ecy;&tcy;&ocy; &pcy;&ocy;&lcy;&iecy;&zcy;&ncy;&ocy;, &iecy;&scy;&lcy;&icy; &ucy; &vcy;&acy;&scy; &iecy;&scy;&tcy;&softcy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy;&ycy; &scy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&icy;&mcy;&icy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;&mcy;&icy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &zcy;&acy;&pcy;&ucy;&scy;&kcy;  <code>git am</code>  &ncy;&iecy; &vcy; &tcy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&iecy; &icy;&lcy;&icy; &ocy;&shcy;&icy;&bcy;&kcy;&acy; &vcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;&khcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ucy;&yucy; &lcy;&iecy;&gcy;&chcy;&iecy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&icy;&tcy;&softcy;, &icy;&zcy;&mcy;&iecy;&ncy;&icy;&vcy; &pcy;&ocy;&chcy;&tcy;&ocy;&vcy;&ycy;&jcy; &yacy;&shchcy;&icy;&kcy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &ocy;&shcy;&icy;&bcy;&kcy;&icy; &vcy; &scy;&tcy;&rcy;&ocy;&kcy;&acy;&khcy;  &quot;From:&quot; ).</span></p> </div> <h2 class="text-body-emphasis"  id="_hooks"><span data-i18n="d412a062620ef57bace76558a0384077b1919e66ba0a35af91e5a372f873e65e/9c" data-source="Hooks" onmousemove="i18n(this)">Hooks</span></h2> <div> <p><span data-i18n="31ee37dcd213e25b4f58749fe3a25671be6681dc9a46d3de1199fd4573cd7250/75" data-source="This command can run &lt;code&gt;applypatch-msg&lt;/code&gt;, &lt;code&gt;pre-applypatch&lt;/code&gt;, and &lt;code&gt;post-applypatch&lt;/code&gt; hooks. See &lt;a href=&quot;githooks&quot;&gt;githooks[5]&lt;/a&gt; for more information." onmousemove="i18n(this)">&Ecy;&tcy;&acy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &mcy;&ocy;&zhcy;&iecy;&tcy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&khcy;&vcy;&acy;&tcy;&chcy;&icy;&kcy;&icy;  <code>applypatch-msg</code> ,  <code>pre-applypatch</code>  &icy;  <code>post-applypatch</code> . &Scy;&mcy;.  <a href="githooks.html">githooks[5]</a>  &dcy;&lcy;&yacy; &pcy;&ocy;&lcy;&ucy;&chcy;&iecy;&ncy;&icy;&yacy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&jcy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&icy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_configuration"><span data-i18n="b332c3492d5eb10a118eb6d8b0dcd689bc2477ce2ae16b303753b942b54377bc/aa" data-source="Configuration" onmousemove="i18n(this)">Configuration</span></h2> <div> <p><span data-i18n="5b8d919fa35b75aa925ebd5414ed6373e762fb0a087a062961c27b2ce9586555/57" data-source="Everything below this line in this section is selectively included from the &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt; documentation. The content is the same as what&amp;rsquo;s found there:" onmousemove="i18n(this)">&Vcy;&scy;&iecy;, &chcy;&tcy;&ocy; &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &ncy;&icy;&zhcy;&iecy; &ecy;&tcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &vcy; &ecy;&tcy;&ocy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;, &vcy;&ycy;&bcy;&ocy;&rcy;&ocy;&chcy;&ncy;&ocy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy; &icy;&zcy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&tscy;&icy;&icy;  <a href="git-config.html">git-config[1]</a> . &Scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&ncy;&icy;&iecy; &tcy;&acy;&kcy;&ocy;&iecy; &zhcy;&iecy;, &kcy;&acy;&kcy; &icy; &ncy;&acy;&jcy;&dcy;&iecy;&ncy;&ncy;&ocy;&iecy; &tcy;&acy;&mcy;:</span></p> <div> <dl> <dt id="Documentation/git-am.txt-amkeepcr"><span data-i18n="63cf84bc9b1d07e45d66efe556ee5f2d22cb20c0f32b478e7f6b31fe3952c70f/4e" data-source="am.keepcr" onmousemove="i18n(this)">am.keepcr</span></dt> <dd> <p><span data-i18n="a3948ea87c267dcabddbaf6415f136000bbc47962f76a7f10ca2498eeb2faba0/29" data-source="If true, git-am will call git-mailsplit for patches in mbox format with parameter &lt;code&gt;--keep-cr&lt;/code&gt;. In this case git-mailsplit will not remove &lt;code&gt;\r&lt;/code&gt; from lines ending with &lt;code&gt;\r\n&lt;/code&gt;. Can be overridden by giving &lt;code&gt;--no-keep-cr&lt;/code&gt; from the command line. See &lt;a href=&quot;git-am&quot;&gt;git-am[1]&lt;/a&gt;, &lt;a href=&quot;git-mailsplit&quot;&gt;git-mailsplit[1]&lt;/a&gt;." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &ecy;&tcy;&ocy; &pcy;&rcy;&acy;&vcy;&dcy;&acy;, git-am &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&tcy;&softcy; git-mailsplit &dcy;&lcy;&yacy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&jcy; &vcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&iecy; mbox &scy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ocy;&mcy;  <code>--keep-cr</code> . &Vcy; &ecy;&tcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; git-mailsplit &ncy;&iecy; &ucy;&dcy;&acy;&lcy;&icy;&tcy;  <code>\r</code>  &icy;&zcy; &scy;&tcy;&rcy;&ocy;&kcy;, &zcy;&acy;&kcy;&acy;&ncy;&chcy;&icy;&vcy;&acy;&yucy;&shchcy;&icy;&khcy;&scy;&yacy; &ncy;&acy;  <code>\r\n</code> . &Mcy;&ocy;&zhcy;&ncy;&ocy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy;, &ucy;&kcy;&acy;&zcy;&acy;&vcy;  <code>--no-keep-cr</code>  &icy;&zcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;. &Scy;&mcy;.  <a href="git-am.html">git-am[1]</a> ,  <a href="git-mailsplit.html">git-mailsplit[1]</a> .</span></p> </dd> <dt id="Documentation/git-am.txt-amthreeWay"><span data-i18n="ae1ad64ca8739bd40ed182ceefc748ab277f09e763a45ddbafad6d6e9f9904de/c3" data-source="am.threeWay" onmousemove="i18n(this)">am.threeWay</span></dt> <dd> <p><span data-i18n="201d45cc0618284861e3f297569369cd4cbe5a32ac76036ba6a5e8275caccb1d/47" data-source="By default, &lt;code&gt;git am&lt;/code&gt; will fail if the patch does not apply cleanly. When set to true, this setting tells &lt;code&gt;git am&lt;/code&gt; to fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally (equivalent to giving the &lt;code&gt;--3way&lt;/code&gt; option from the command line). Defaults to &lt;code&gt;false&lt;/code&gt;. See &lt;a href=&quot;git-am&quot;&gt;git-am[1]&lt;/a&gt;." onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  <code>git am</code>  &vcy;&ycy;&jcy;&dcy;&iecy;&tcy; &icy;&zcy; &scy;&tcy;&rcy;&ocy;&yacy;, &iecy;&scy;&lcy;&icy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &ncy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&iecy;&ncy;&ocy; &kcy;&ocy;&rcy;&rcy;&iecy;&kcy;&tcy;&ncy;&ocy;. &IEcy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; true, &ecy;&tcy;&ocy;&tcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy; &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;  <code>git am</code>  &vcy;&iecy;&rcy;&ncy;&ucy;&tcy;&softcy;&scy;&yacy; &kcy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&mcy;&ucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yucy;, &iecy;&scy;&lcy;&icy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &icy;&dcy;&iecy;&ncy;&tcy;&icy;&fcy;&icy;&kcy;&acy;&tcy;&ocy;&rcy;&ycy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&khcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&khcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ocy;&vcy;, &kcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &ocy;&ncy;&ocy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ocy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&tcy;&softcy;&scy;&yacy;, &icy; &ucy; &ncy;&acy;&scy; &iecy;&scy;&tcy;&softcy; &ecy;&tcy;&icy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&iecy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ycy;, &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy;&iecy; &lcy;&ocy;&kcy;&acy;&lcy;&softcy;&ncy;&ocy; (&ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yucy; &ocy;&pcy;&tscy;&icy;&icy;  <code>--3way</code>  &icy;&zcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;). . &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  <code>false</code> . &Scy;&mcy;.  <a href="git-am.html">git-am[1]</a> .</span></p> </dd> </dl> </div> </div> <h2 class="text-body-emphasis"  id="_see_also"><span data-i18n="2fa97693b70fa87b95b2d1bdf9558e4ac65d5e82d145f13a03849c4d9c4957a9/40" data-source="See also" onmousemove="i18n(this)">See also</span></h2> <div> <p><span data-i18n="7eff8fc72a979bf4886a6e68bf96b066b728ecb328ed07c615172723198c51a8/0b" data-source="&lt;a href=&quot;git-apply&quot;&gt;git-apply[1]&lt;/a&gt;, &lt;a href=&quot;git-format-patch&quot;&gt;git-format-patch[1]&lt;/a&gt;." onmousemove="i18n(this)"><a href="git-apply.html">git-apply[1]</a>, <a href="git-format-patch.html">git-format-patch[1]</a>.</span></p> </div><address>
<p>
    &copy; 2012&ndash;2024 Scott Chacon and others<br/>Licensed under the MIT License.<br/>
<a href="https://git-scm.com/docs/git-am">https://git-scm.com/docs/git-am</a>
</p>
</address>                </article>
            </main>

            <br>
            <br>
            <hr>

                               <ins class="adsbygoogle"
        style="display:block"
        data-ad-format="autorelaxed"
        data-ad-client="ca-pub-6424571640879890"
        data-ad-slot="7867651344"></ins>
   <script>
        (adsbygoogle = window.adsbygoogle || []).push({});
   </script>            
        </div>

        <!-- -->

        <div class="col-md-3">
            <br>
            <form action="-index-.html">
                <div class="input-group">
                    <input class="form-control" type="search" name="q" placeholder="Search for Git" required>
                    <button class="btn btn-primary" type="submit">
                        <i class="bi bi-search"></i>
                    </button>
                </div>
            </form>
            <br>

                            <div class="list-group list-group-flush">
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-annotate.html">
                            git annotate                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-apply.html">
                            git apply                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-archimport.html">
                            git archimport                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-archive.html">
                            git archive                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-bisect.html">
                            git bisect                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-bisect-lk2009.html">
                            git bisect-lk2009                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-blame.html">
                            git blame                        </a>
                                    </div>
            
            <br>
            <div class="my-3">
                <ins class="adsbygoogle"
     style="display:block"
     data-ad-client="ca-pub-6424571640879890"
     data-ad-slot="3954319254"
     data-ad-format="auto"
     data-full-width-responsive="true"></ins>
<script>
     (adsbygoogle = window.adsbygoogle || []).push({});
</script>            </div>
            <br>

            
            
        </div>
    </div>
</div>    <!--/sse-->

    <footer>
        <br>
        <div class="container">
            <div class="row">
                <div class="col">
                    <hr>
                    <div class="row">
                        <div class="col-md-10">
                            <ul class="nav">
                                <li class="nav-item">
                                    <a class="nav-link ps-0" href="https://runebook.dev/">Help us Improve Translation</a>
                                </li>
                                                            </ul>
                        </div>
                        <div class="col-md-2 text-end">
                            <a href="git-am.html#" class="fs-5" aria-label="Top">
                                <i class="bi bi-arrow-up-square-fill"></i>
                            </a>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <br>
    </footer>
    <script src="../../../runebook.js"></script>
</body>

</html>